stylecontext: Call get_style(), not create_style()

We want to ensure that the style is created properly.

This also allows making the create_Style() function private.

diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c
index 8f089e04cef7287892f407243836f9d5d7242e34..64e6a3722ebd4c40d50608d51af1f32316924252 100644 (file)
--- a/gtk/gtkcssnode.c
+++ b/gtk/gtkcssnode.c
@@ -177,7 +177,7 @@ store_in_global_parent_cache (GtkCssNode                  *node,
                        g_object_ref (style));
 }
 
-GtkCssStyle *
+static GtkCssStyle *
 gtk_css_node_create_style (GtkCssNode *cssnode)
 {
   const GtkCssNodeDeclaration *decl;

diff --git a/gtk/gtkcssnodeprivate.h b/gtk/gtkcssnodeprivate.h
index 1b22fe548e6630e06f46cb91aec8501d01230e3b..00a106a8c280c3dbdd656be6d64b27651d22570b 100644 (file)
--- a/gtk/gtkcssnodeprivate.h
+++ b/gtk/gtkcssnodeprivate.h
@@ -131,10 +131,8 @@ GList *                 gtk_css_node_list_regions       (GtkCssNode            *
 
 const GtkCssNodeDeclaration *
                         gtk_css_node_get_declaration    (GtkCssNode            *cssnode);
-
-
 GtkCssStyle *           gtk_css_node_get_style          (GtkCssNode            *cssnode);
-GtkCssStyle *           gtk_css_node_create_style       (GtkCssNode            *cssnode);
+
 
 void                    gtk_css_node_invalidate_style_provider
                                                         (GtkCssNode            *cssnode);

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 1dd917afa87bdef74210e2f4e24e9d8f6c1caa44..bbf629a39c243685a62852b2c4b1d5bb290922cb 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -525,7 +525,7 @@ gtk_style_context_lookup_style_for_state (GtkStyleContext *context,
   node = gtk_css_transient_node_new (context->priv->cssnode);
   gtk_css_node_set_parent (node, gtk_css_node_get_parent (context->priv->cssnode));
   gtk_css_node_set_state (node, state);
-  values = gtk_css_node_create_style (node);
+  values = g_object_ref (gtk_css_node_get_style (node));
   gtk_css_node_set_parent (node, NULL);
   g_object_unref (node);